CodeMirror v6 + JSON Schema support #4116

Ryanseanlee · 2025-10-20T20:17:26Z

Hoist P/R Checklist

Pull request authors: Review and check off the below. Items that do not apply can also be
checked off to indicate they have been considered. If unclear if a step is relevant, please leave
unchecked and note in comments.

Caught up with develop branch as of last change.
Added CHANGELOG entry, or determined not required.
Reviewed for breaking changes, added breaking-change label + CHANGELOG if so.
Updated doc comments / prop-types, or determined not required.
Reviewed and tested on Mobile, or determined not required.
Created Toolbox branch / PR, or determined not required.

If your change is still a WIP, please use the "Create draft pull request" option in the split
button below to indicate it is not ready yet for a final review.

Pull request reviewers: when merging this P/R, please consider using a squash commit to
collapse multiple intermediate commits into a single commit representing the overall feature
change. This helps keep the commit log clean and easy to scan across releases. PRs containing a
single commit should be rebased when possible.

# Conflicts: # yarn.lock

data/cube/View.ts

package.json

…cted. - update to code mirrors own CSS now uses !important for the same class with a relative position

desktop/cmp/input/CodeInput.scss

desktop/cmp/input/JsonInput.ts

# Conflicts: # yarn.lock

PeteDarinzo

Reviewed with comment

desktop/cmp/input/CodeInput.ts

package.json

desktop/cmp/input/JsonInput.ts

amcclain · 2025-11-19T15:43:34Z

@PeteDarinzo thanks for looking at these with Ryan. Does this look complete and mergable from your POV? If so could you please approve the PR to indicate as much, or if any concerns or more testing / closer look needed don't hesitate to say as much. Thanks much would love to get it in (safely) when ready.

PeteDarinzo · 2025-11-20T17:15:50Z

@amcclain PR is nearly ready, but I almost overlooked the legacy editorProps prop. The new version does not support this prop, and it is used in at least two client apps, in one case to turn off line numbers, in the other to provide extra keyboard mappings. I would assume the use of this prop is quite narrow, but I will conduct a poll of usage across other client apps. The prop itself might not need continued support, and if its current use is limited it may be practical to add props to support whatever it was used for (toggling line numbers, providing keymaps).

amcclain · 2025-11-25T22:34:03Z

if its current use is limited it may be practical to add props to support whatever it was used for (toggling line numbers, providing keymaps).

Great, fully agree with that. In general it's nice to have an "escape hatch" that allows us to set any underlying props that the library component might support - is that general concept not supportable with the upgraded version? Doesn't need to be a blocker but would be interested to understand better

CHANGELOG.md

desktop/cmp/input/CodeInput.scss

PeteDarinzo

Approved

desktop/cmp/input/JsonInput.ts

CHANGELOG.md

desktop/cmp/input/CodeInput.ts

# Conflicts: # CHANGELOG.md

lbwexler · 2026-01-06T17:13:12Z

Looks like the line number/tree gutter of json input gets substantially wider -- I think its a regression. Can we take a look?
(the tree affordances are now on the left of the line numbers -- which seems better, but the width growth is a problem)

desktop/cmp/input/CodeInput.ts

lbwexler · 2026-01-07T15:15:29Z

desktop/cmp/input/CodeInput.ts

            } = this.componentProps,
            extensions = [
                // Theme
                this.themeCompartment.of(this.getThemeExtension()),


Can you build the themeCompartment.of in to getThemeExtension(), so this looks like all the other extensions

Yes but note changes to line 301, 498, and 501-503. getThemeExtension will now create the theme extension Compartment and the reaction calls getTheme() to reconfigure.

Ryanseanlee · 2026-01-07T17:42:02Z

Looks like the line number/tree gutter of json input gets substantially wider -- I think its a regression. Can we take a look? (the tree affordances are now on the left of the line numbers -- which seems better, but the width growth is a problem)

I reordered the lint gutter, number gutter and fold gutter to match previous CM5. The widths are actually the same I think the order is what made it look wider as there was alot of empty space to the left of the number.

CHANGELOG.md

package.json

desktop/cmp/filechooser/FileChooserModel.ts

desktop/cmp/input/CodeInput.scss

desktop/cmp/input/CodeInput.ts

desktop/cmp/input/JsonInput.ts

# Conflicts: # CHANGELOG.md

# Conflicts: # CHANGELOG.md # desktop/cmp/input/CodeInput.scss

Ryanseanlee added 3 commits October 20, 2025 13:01

Code mirror 6 checkpoint with AJV json schema validator

b344e86

Merge branch 'develop' into codemirror6&JsonSchema

f1548b4

# Conflicts: # yarn.lock

yarn lock

685e771

Ryanseanlee requested a review from RyanMG October 20, 2025 20:17

RyanMG reviewed Oct 20, 2025

View reviewed changes

data/cube/View.ts Show resolved Hide resolved

RyanMG reviewed Oct 20, 2025

View reviewed changes

package.json Outdated Show resolved Hide resolved

RyanMG and others added 3 commits October 20, 2025 16:32

XH sass override for codeMirror editior needs it position to be respe…

794d8db

…cted. - update to code mirrors own CSS now uses !important for the same class with a relative position

AJV options

6cc344f

AJV options

376eea0

RyanMG reviewed Oct 20, 2025

View reviewed changes

desktop/cmp/input/CodeInput.scss Show resolved Hide resolved

RyanMG reviewed Oct 20, 2025

View reviewed changes

desktop/cmp/input/JsonInput.ts Show resolved Hide resolved

RyanMG reviewed Oct 21, 2025

View reviewed changes

desktop/cmp/input/JsonInput.ts Outdated Show resolved Hide resolved

RyanMG reviewed Oct 21, 2025

View reviewed changes

desktop/cmp/input/JsonInput.ts Outdated Show resolved Hide resolved

RyanMG reviewed Oct 21, 2025

View reviewed changes

desktop/cmp/input/JsonInput.ts Outdated Show resolved Hide resolved

Type and comment jsonSchema in JsonInput.ts

e59150a

amcclain changed the title ~~Codemirror6&json schema~~ Upgrade to CodeMirror v6 + add JSON Schema support Oct 24, 2025

amcclain changed the title ~~Upgrade to CodeMirror v6 + add JSON Schema support~~ CodeMirror v6 + JSON Schema support Oct 24, 2025

Ryanseanlee added 4 commits October 28, 2025 12:22

Use codeMirror language-data to apply language extensions

d5fa02f

remove console.log

15f2ecc

update CHANGELOG

3f98634

Merge branch 'develop' into codemirror6&JsonSchema

eb6736c

# Conflicts: # yarn.lock

Ryanseanlee marked this pull request as ready for review November 3, 2025 23:28

Merge branch 'develop' into codemirror6&JsonSchema

3950c37

PeteDarinzo reviewed Nov 6, 2025

View reviewed changes

Ryanseanlee added 3 commits November 6, 2025 10:12

Merge branch 'develop' into codemirror6&JsonSchema

1c21851

yarn.lock

be3bd1d

Pete CR

3aeb797

PeteDarinzo and others added 11 commits December 15, 2025 11:51

Limit code mirror themes to github light/dark

8affcc1

Yarn lock

eb36cf7

Custom theme implementation

9a662fc

Statically import languages

cfe8a3a

test

85e3604

use static imports add log for debug

7ab2767

debugging

0f41c42

debugging

2b03cf5

debugging

23975b8

debugging

5d1de84

remove custom theme impl

0928c85

PeteDarinzo reviewed Dec 16, 2025

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

PeteDarinzo reviewed Dec 16, 2025

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

PeteDarinzo reviewed Dec 16, 2025

View reviewed changes

desktop/cmp/input/CodeInput.scss Outdated Show resolved Hide resolved

Pete CR clean ups

1ab7515

PeteDarinzo approved these changes Dec 17, 2025

View reviewed changes

lbwexler reviewed Dec 30, 2025

View reviewed changes

Ryanseanlee and others added 3 commits December 30, 2025 16:07

Merge Develop

d8897e3

Lee CR

97bf45c

Merge branch 'develop' into codemirror6&JsonSchema

82a31f0

# Conflicts: # CHANGELOG.md

Lee CR

2fdd2c1

lbwexler reviewed Jan 7, 2026

View reviewed changes

desktop/cmp/input/CodeInput.ts Outdated Show resolved Hide resolved

lbwexler reviewed Jan 7, 2026

View reviewed changes

Lee CR

9a9fe59

amcclain reviewed Jan 8, 2026

View reviewed changes

Ryanseanlee added 3 commits January 8, 2026 09:12

Merge branch 'develop' into codemirror6&JsonSchema

f52698d

# Conflicts: # CHANGELOG.md

ATM CR

7f96a1b

Merge branch 'develop' into codemirror6&JsonSchema

1e12ee7

# Conflicts: # CHANGELOG.md # desktop/cmp/input/CodeInput.scss

CodeMirror v6 + JSON Schema support #4116

Are you sure you want to change the base?

CodeMirror v6 + JSON Schema support #4116

Uh oh!

Conversation

Ryanseanlee commented Oct 20, 2025

Hoist P/R Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PeteDarinzo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

amcclain commented Nov 19, 2025

Uh oh!

PeteDarinzo commented Nov 20, 2025

Uh oh!

amcclain commented Nov 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

PeteDarinzo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lbwexler commented Jan 6, 2026

Uh oh!

Uh oh!

lbwexler Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Ryanseanlee Jan 7, 2026

Choose a reason for hiding this comment

Uh oh!

Ryanseanlee commented Jan 7, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants